# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1496.1.21 -> 1.1496.1.22
#	include/asm-ia64/sal.h	1.19    -> 1.20   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/12/19	bjorn.helgaas@hp.com	1.1496.1.22
# [PATCH] ia64: Prevent SAL calls from being preempted
# 
# (SAL_CALL_REENTRANT): Disable preemption around the SAL call to
# make sure we don't get rescheduled on a different CPU.
# --------------------------------------------
#
diff -Nru a/include/asm-ia64/sal.h b/include/asm-ia64/sal.h
--- a/include/asm-ia64/sal.h	Sat Dec 20 00:39:09 2003
+++ b/include/asm-ia64/sal.h	Sat Dec 20 00:39:09 2003
@@ -71,7 +71,9 @@
 # define SAL_CALL_REENTRANT(result,args...) do {	\
 	struct ia64_fpreg __ia64_scs_fr[6];		\
 	ia64_save_scratch_fpregs(__ia64_scs_fr);	\
+	preempt_disable();				\
 	__SAL_CALL(result, args);			\
+	preempt_enable();				\
 	ia64_load_scratch_fpregs(__ia64_scs_fr);	\
 } while (0)